core: remove stub http backend for now

The plain http pull is probably good enough.

diff --git a/Makefile-src.am b/Makefile-src.am
index ae28761e32498fb3e375cadc5b8af3340a280a65..30b5af868ac8328a6646e530b5dc7748d13beb33 100644 (file)
--- a/Makefile-src.am
+++ b/Makefile-src.am
@@ -61,10 +61,3 @@ ostree_SOURCES = src/main.c \
        $(NULL)
 ostree_CFLAGS = -I$(srcdir)/src -I$(srcdir)/src/libostree -I$(srcdir)/src/libotutil -DLOCALEDIR=\"$(datadir)/locale\" $(OT_COREBIN_DEP_CFLAGS)
 ostree_LDADD = libotutil.la libostree.la $(OT_COREBIN_DEP_LIBS)
-
-bin_PROGRAMS += ostree-http-backend
-
-ostree_http_backend_SOURCES = src/ostree-http-backend.c
-ostree_http_backend_CFLAGS = -I$(srcdir)/src -I$(srcdir)/src/libostree -I$(srcdir)/src/libotutil -DLOCALEDIR=\"$(datadir)/locale\" $(OT_COREBIN_DEP_CFLAGS)
-ostree_http_backend_LDADD = libotutil.la libostree.la $(OT_COREBIN_DEP_LIBS)
-

diff --git a/src/ostree-http-backend.c b/src/ostree-http-backend.c
deleted file mode 100644 (file)
index ebde526..0000000
--- a/src/ostree-http-backend.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
- *
- * Copyright (C) 2011 Colin Walters <walters@verbum.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * Author: Colin Walters <walters@verbum.org>
- */
-
-#include "config.h"
-
-#include <libsoup/soup-gnome.h>
-#include <ostree.h>
-
-#include <string.h>
-
-int
-main (int     argc,
-      char  **argv)
-{
-  const char *repo_root;
-
-  g_type_init ();
-
-  repo_root = g_getenv ("OSTREE_REPO_PREFIX");
-  if (!repo_root)
-    {
-      g_printerr ("OSTREE_REPO_PREFIX not set\n");
-      return 1;
-    }
-
-  return 0;
-}

diff --git a/tests/libtest.sh b/tests/libtest.sh
index 526c88aa56b10e1c74dc2d95b8a4c993314a6d27..0068b58e33afe8662f602450bd8adeff9acf482e 100644 (file)
--- a/tests/libtest.sh
+++ b/tests/libtest.sh
@@ -119,8 +119,6 @@ setup_fake_remote_repo1() {
     cd ${test_tmpdir}
     mkdir ${test_tmpdir}/httpd
     cd httpd
-    cp $(command -v ostree-http-backend) .
-    chmod a+x ostree-http-backend
     cat >httpd.conf <<EOF
 ServerRoot ${test_tmpdir}/httpd
 PidFile pid